* doc/lispref/keymaps.texi (Menu Bar): Minor clarification.

* src/xdisp.c (syms_of_xdisp): Doc clarification (bug#15657).

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 493e0e34ceb4b4200bd2a0b2bed38473d781fd3d..acec501adb02bded05cc07f68435f00cd9c31ce4 100644 (file)
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,7 @@
+2014-02-08  Lars Ingebrigtsen  <larsi@gnus.org>
+
+       * keymaps.texi (Menu Bar): Minor clarification (bug#15657).
+
 2014-02-06  Glenn Morris  <rgm@gnu.org>
 
        * display.texi (Truncation):

diff --git a/doc/lispref/keymaps.texi b/doc/lispref/keymaps.texi
index d81067eed314e74b915fe99646718ba2e1bb4de3..a372cecb818e9c9b87d9ae8525ac1bfb765a384d 100644 (file)
--- a/doc/lispref/keymaps.texi
+++ b/doc/lispref/keymaps.texi
@@ -2559,7 +2559,7 @@ at the end of the menu bar, following local menu items.
 
 @defvar menu-bar-update-hook
 This normal hook is run by redisplay to update the menu bar contents,
-before redisplaying the menu bar.  You can use it to update submenus
+before redisplaying the menu bar.  You can use it to update menus
 whose contents should vary.  Since this hook is run frequently, we
 advise you to ensure that the functions it calls do not take much time
 in the usual case.

diff --git a/src/ChangeLog b/src/ChangeLog
index 77eb0b1ccabfc497f13021de416bc7f3bd907bce..a73cbad0b60b859260b092849f6fbf4d402407ae 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2014-02-08  Lars Ingebrigtsen  <larsi@gnus.org>
 
+       * xdisp.c (syms_of_xdisp): Doc clarification (bug#15657).
+
        * keyboard.c (Frecursive_edit): Say more precicely how throwing
        `exit' works (bug#15865).
 

diff --git a/src/xdisp.c b/src/xdisp.c
index 430551b2b68b9ce89188a833e76373e94b3c34a0..d941c7b1086ed7f43031462bdf21abc50ddd52a9 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -30138,8 +30138,8 @@ Bind this around calls to `message' to let it take effect.  */);
   DEFVAR_LISP ("menu-bar-update-hook",  Vmenu_bar_update_hook,
     doc: /* Normal hook run to update the menu bar definitions.
 Redisplay runs this hook before it redisplays the menu bar.
-This is used to update submenus such as Buffers,
-whose contents depend on various data.  */);
+This is used to update menus such as Buffers, whose contents depend on
+various data.  */);
   Vmenu_bar_update_hook = Qnil;
 
   DEFVAR_LISP ("menu-updating-frame", Vmenu_updating_frame,